auto merge of #605 : brson/cargo/https, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 21 Sep 2014 21:39:47 +0000 (21:39 +0000)
committerbors <bors@rust-lang.org>
Sun, 21 Sep 2014 21:39:47 +0000 (21:39 +0000)

Trivial merge